Fixed merge errrors