Resolved some conflicted code