testing conflicts - gfree user
submitting after resolving conflict