Unmerged branches fixed. Everything's ok now