scary last minute merge conflict