solves merge conflicts