removing conflicting copy from before
removing old dependencies
fix bug strange page2 size
resolving conflict edit