Apparently didn't take care of merge conflict before. Did it now