added the things that were being threaten by how to merge