Fix merge issues and added edit functionality for root