Corrected some merge conflicts and spacing issues