Got rid of merge conflict tail