Solves merge conflict