Resolves horrible merge conflicts maybe?