fixing prompt to check better for conflicts