Fixed conflict & typos