Before pull the origin
Merge local with remote
Make *.elc files ignored