Fixed branch merge and fixed light script