solved merge conflicts, project settings indent width (4 spaces, 4 tabs)