merges bugs fixed