Resolved some minor conflicts with main.m