random changes
fixing merge