finally fixed all merging i hope