Fixed Merge Errors and content margins