Updated files with merge