initializing new repo with existing code
fixing merge