Adam/resolve merge conflicts