fixing git
fixing merge