Fixes merging craziness.