Mastouri
Resolve merge conflicts and add new files
ece7718