Fixed minor merge conflict concerning the placement of brackets and indentation again, forgot a few merge conflicts.