Merges back branch