Initial Commnit
Fixing merge