Fixed conflict with master before merging