Fixed merge erros