Fixed mis-merges