commit to create conflict