Main scene merge conflict resolved