Committing merge compile fix