Some merges changes