Fix horrible merge