merge and resolve conflict with master