Finish merge with master