some things
conflicts resolved
fixed bug with not working links
fixed editor