Added main function
merge fix