Cleaned application and solved conflicts