testing git prompt
created conflict
resolved conflicts