Resolved a couple more conflicts