Fixed very bad merge