T a merge2

ok please god work