Subindo projeto
Merged master fixed conflict.