Make perfect
resolve merge conflicts