Fixed weird git conflict