checking in merge conflicts baaaaad