Fixed more syntax issues - seems to be related to a merge conflict