cleaned up aliases
clean up functions
resolved conflicts