commiting for catch
commiting after resolving the conflicts