Fixed weird merging error :smile: