Revert "conflict resolving pt 3"

This reverts commit 1f3387858aed638d7f9e0d5fb55b32373aa43be5.