Resolved recent merge conflicts

Fixed recent merge conflicts.