Fixed weird git merging conflict