resolved git conflicts