Manually solved merge conflicts