Resolved conflicts
Updated project titan background