Solving merge conflicts

After a commit squash there were unsolved conflicts and didn't notice before.