fix merge and macros

Git ignore 
Macros
Merge plugin