Resolved git conflicts