Udated since git conflicts 1