Updated .gitignore to avoid *pro.user checking
Updated building profile
Confilict fixed