Fixed conflict with README when merging