Fixed some more merge errors that where still present