Hi, When updating my local copy 'git pull' failed on Boost.Align with the following error: git pull Auto-merging test/is_aligned_test.cpp CONFLICT (add/add): Merge conflict in test/is_aligned_test.cpp Auto-merging test/aligned_delete_test.cpp CONFLICT (add/add): Merge conflict in test/aligned_delete_test.cpp Auto-merging test/aligned_allocator_test.cpp CONFLICT (add/add): Merge conflict in test/aligned_allocator_test.cpp Auto-merging test/aligned_allocator_adaptor_test.cpp CONFLICT (add/add): Merge conflict in test/aligned_allocator_adaptor_test.cpp Auto-merging test/aligned_alloc_test.cpp CONFLICT (add/add): Merge conflict in test/aligned_alloc_test.cpp Auto-merging test/align_test.cpp CONFLICT (add/add): Merge conflict in test/align_test.cpp Auto-merging test/Jamfile.v2 CONFLICT (add/add): Merge conflict in test/Jamfile.v2 Auto-merging meta/libraries.json CONFLICT (add/add): Merge conflict in meta/libraries.json Auto-merging index.html CONFLICT (add/add): Merge conflict in index.html Auto-merging include/boost/align/is_aligned.hpp CONFLICT (add/add): Merge conflict in include/boost/align/is_aligned.hpp Auto-merging include/boost/align/detail/max_count_of.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/max_count_of.hpp Auto-merging include/boost/align/detail/max_align.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/max_align.hpp Auto-merging include/boost/align/detail/is_alignment.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/is_alignment.hpp Auto-merging include/boost/align/detail/is_aligned.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/is_aligned.hpp Auto-merging include/boost/align/detail/alignment_of.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/alignment_of.hpp Auto-merging include/boost/align/detail/aligned_alloc_sunos.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/aligned_alloc_sunos.hpp Auto-merging include/boost/align/detail/aligned_alloc_posix.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/aligned_alloc_posix.hpp Auto-merging include/boost/align/detail/aligned_alloc_msvc.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/aligned_alloc_msvc.hpp Auto-merging include/boost/align/detail/aligned_alloc_macos.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/aligned_alloc_macos.hpp Auto-merging include/boost/align/detail/aligned_alloc_android.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/aligned_alloc_android.hpp Auto-merging include/boost/align/detail/aligned_alloc.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/aligned_alloc.hpp Auto-merging include/boost/align/detail/align_cxx11.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/align_cxx11.hpp Auto-merging include/boost/align/detail/align.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/align.hpp Auto-merging include/boost/align/detail/addressof.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/addressof.hpp Auto-merging include/boost/align/detail/address.hpp CONFLICT (add/add): Merge conflict in include/boost/align/detail/address.hpp Auto-merging include/boost/align/aligned_delete_forward.hpp CONFLICT (add/add): Merge conflict in include/boost/align/aligned_delete_forward.hpp Auto-merging include/boost/align/aligned_delete.hpp CONFLICT (add/add): Merge conflict in include/boost/align/aligned_delete.hpp Auto-merging include/boost/align/aligned_allocator_forward.hpp CONFLICT (add/add): Merge conflict in include/boost/align/aligned_allocator_forward.hpp Auto-merging include/boost/align/aligned_allocator_adaptor_forward.hpp CONFLICT (add/add): Merge conflict in include/boost/align/aligned_allocator_adaptor_forward.hpp Auto-merging include/boost/align/aligned_allocator_adaptor.hpp CONFLICT (add/add): Merge conflict in include/boost/align/aligned_allocator_adaptor.hpp Auto-merging include/boost/align/aligned_allocator.hpp CONFLICT (add/add): Merge conflict in include/boost/align/aligned_allocator.hpp Auto-merging include/boost/align/aligned_alloc.hpp CONFLICT (add/add): Merge conflict in include/boost/align/aligned_alloc.hpp Auto-merging include/boost/align/align.hpp CONFLICT (add/add): Merge conflict in include/boost/align/align.hpp Auto-merging include/boost/align.hpp CONFLICT (add/add): Merge conflict in include/boost/align.hpp Auto-merging example/make_aligned.hpp CONFLICT (add/add): Merge conflict in example/make_aligned.hpp Auto-merging example/aligned_vector.hpp CONFLICT (add/add): Merge conflict in example/aligned_vector.hpp Auto-merging example/aligned_ptr.hpp CONFLICT (add/add): Merge conflict in example/aligned_ptr.hpp Auto-merging doc/align.qbk CONFLICT (add/add): Merge conflict in doc/align.qbk Auto-merging doc/Jamfile.v2 CONFLICT (add/add): Merge conflict in doc/Jamfile.v2 Auto-merging README.md CONFLICT (add/add): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result. This is on the master branch. I didn't modify my local copy of Boost.Align, so there must have been some weird change upstream that cannot be merged automatically. Does anyone know why this happens? For now I just reset my local branch to be equal to the remote master, but this kind of problem happened before and it breaks my update scripts.