Fixed compilation and merge